From 06773b1e8be3bc953230c0f1c2e9fce9677cfac2 Mon Sep 17 00:00:00 2001
From: Michael Natterer <mitch@gimp.org>
Date: Tue, 28 Sep 2010 16:03:59 +0200
Subject: [PATCH] gdk: remove "screen" member from GdkOffscreenWindow, it has
 become obsolete

Also remove screen parameter from _gdk_offscreen_window_new() and get
rid of a bunch on includes in gdkoffscreenwindow.c
---
 gdk/gdkinternals.h       |  1 -
 gdk/gdkoffscreenwindow.c | 13 +++----------
 gdk/gdkwindow.c          |  2 +-
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/gdk/gdkinternals.h b/gdk/gdkinternals.h
index 10469d1812..9f2c4ca183 100644
--- a/gdk/gdkinternals.h
+++ b/gdk/gdkinternals.h
@@ -552,7 +552,6 @@ GdkWindow *_gdk_window_get_input_window_for_event (GdkWindow *native_window,
  *****************************/
 GType gdk_offscreen_window_get_type (void);
 void       _gdk_offscreen_window_new                 (GdkWindow     *window,
-						      GdkScreen     *screen,
 						      GdkWindowAttr *attributes,
 						      gint           attributes_mask);
 
diff --git a/gdk/gdkoffscreenwindow.c b/gdk/gdkoffscreenwindow.c
index 09375d3f81..ebbdcc7737 100644
--- a/gdk/gdkoffscreenwindow.c
+++ b/gdk/gdkoffscreenwindow.c
@@ -24,16 +24,13 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#include <config.h>
+#include "config.h"
+
 #include <math.h>
-#include "gdk.h"
+
 #include "gdkwindow.h"
 #include "gdkinternals.h"
 #include "gdkwindowimpl.h"
-#include "gdkdrawable.h"
-#include "gdktypes.h"
-#include "gdkscreen.h"
-#include "gdkcolor.h"
 
 
 /* LIMITATIONS:
@@ -51,7 +48,6 @@ struct _GdkOffscreenWindow
   GdkDrawable parent_instance;
 
   GdkWindow *wrapper;
-  GdkScreen *screen;
 
   cairo_surface_t *surface;
   GdkWindow *embedder;
@@ -138,7 +134,6 @@ gdk_offscreen_window_ref_cairo_surface (GdkDrawable *drawable)
 
 void
 _gdk_offscreen_window_new (GdkWindow     *window,
-			   GdkScreen     *screen,
 			   GdkWindowAttr *attributes,
 			   gint           attributes_mask)
 {
@@ -159,8 +154,6 @@ _gdk_offscreen_window_new (GdkWindow     *window,
   offscreen = GDK_OFFSCREEN_WINDOW (private->impl);
   offscreen->wrapper = window;
 
-  offscreen->screen = screen;
-
   offscreen->surface = gdk_window_create_similar_surface ((GdkWindow *)private->parent,
                                                           CAIRO_CONTENT_COLOR,
                                                           private->width,
diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index ebe8480c53..098309cbc1 100644
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -1386,7 +1386,7 @@ gdk_window_new (GdkWindow     *parent,
 
   if (gdk_window_is_offscreen (private))
     {
-      _gdk_offscreen_window_new (window, screen, attributes, attributes_mask);
+      _gdk_offscreen_window_new (window, attributes, attributes_mask);
       private->impl_window = private;
     }
   else if (native)
-- 
2.30.2